removed functions gtk_object_set_data_destroy and

Thu Oct  8 07:07:10 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkobject.h:
        * gtk/gtkobject.c:
        removed functions gtk_object_set_data_destroy and
        gtk_object_set_data_destroy_by_id.
        added functions gtk_object_remove_no_notify and
        gtk_object_remove_no_notify_by_id which will remove a certain data
        portion without invokation of its destroy notifier, this should only
        be used in very controled circumstances.

diff --git a/ChangeLog b/ChangeLog
index cb691ee3ac0580cd2f37e02d53f2918e941453a2..a28a883c98f2d0a29d80649cebb0e29dd492cb50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Oct  8 07:07:10 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkobject.h: 
+       * gtk/gtkobject.c:
+       removed functions gtk_object_set_data_destroy and
+       gtk_object_set_data_destroy_by_id.
+       added functions gtk_object_remove_no_notify and
+       gtk_object_remove_no_notify_by_id which will remove a certain data
+       portion without invokation of its destroy notifier, this should only
+       be used in very controled circumstances.
+
 Wed Oct  7 23:59:37 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_set_column_resizeable): added

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index cb691ee3ac0580cd2f37e02d53f2918e941453a2..a28a883c98f2d0a29d80649cebb0e29dd492cb50 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Thu Oct  8 07:07:10 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkobject.h: 
+       * gtk/gtkobject.c:
+       removed functions gtk_object_set_data_destroy and
+       gtk_object_set_data_destroy_by_id.
+       added functions gtk_object_remove_no_notify and
+       gtk_object_remove_no_notify_by_id which will remove a certain data
+       portion without invokation of its destroy notifier, this should only
+       be used in very controled circumstances.
+
 Wed Oct  7 23:59:37 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_set_column_resizeable): added

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cb691ee3ac0580cd2f37e02d53f2918e941453a2..a28a883c98f2d0a29d80649cebb0e29dd492cb50 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Thu Oct  8 07:07:10 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkobject.h: 
+       * gtk/gtkobject.c:
+       removed functions gtk_object_set_data_destroy and
+       gtk_object_set_data_destroy_by_id.
+       added functions gtk_object_remove_no_notify and
+       gtk_object_remove_no_notify_by_id which will remove a certain data
+       portion without invokation of its destroy notifier, this should only
+       be used in very controled circumstances.
+
 Wed Oct  7 23:59:37 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_set_column_resizeable): added

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index cb691ee3ac0580cd2f37e02d53f2918e941453a2..a28a883c98f2d0a29d80649cebb0e29dd492cb50 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Thu Oct  8 07:07:10 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkobject.h: 
+       * gtk/gtkobject.c:
+       removed functions gtk_object_set_data_destroy and
+       gtk_object_set_data_destroy_by_id.
+       added functions gtk_object_remove_no_notify and
+       gtk_object_remove_no_notify_by_id which will remove a certain data
+       portion without invokation of its destroy notifier, this should only
+       be used in very controled circumstances.
+
 Wed Oct  7 23:59:37 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_set_column_resizeable): added

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cb691ee3ac0580cd2f37e02d53f2918e941453a2..a28a883c98f2d0a29d80649cebb0e29dd492cb50 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Thu Oct  8 07:07:10 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkobject.h: 
+       * gtk/gtkobject.c:
+       removed functions gtk_object_set_data_destroy and
+       gtk_object_set_data_destroy_by_id.
+       added functions gtk_object_remove_no_notify and
+       gtk_object_remove_no_notify_by_id which will remove a certain data
+       portion without invokation of its destroy notifier, this should only
+       be used in very controled circumstances.
+
 Wed Oct  7 23:59:37 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_set_column_resizeable): added

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cb691ee3ac0580cd2f37e02d53f2918e941453a2..a28a883c98f2d0a29d80649cebb0e29dd492cb50 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Thu Oct  8 07:07:10 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkobject.h: 
+       * gtk/gtkobject.c:
+       removed functions gtk_object_set_data_destroy and
+       gtk_object_set_data_destroy_by_id.
+       added functions gtk_object_remove_no_notify and
+       gtk_object_remove_no_notify_by_id which will remove a certain data
+       portion without invokation of its destroy notifier, this should only
+       be used in very controled circumstances.
+
 Wed Oct  7 23:59:37 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_set_column_resizeable): added

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cb691ee3ac0580cd2f37e02d53f2918e941453a2..a28a883c98f2d0a29d80649cebb0e29dd492cb50 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Thu Oct  8 07:07:10 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkobject.h: 
+       * gtk/gtkobject.c:
+       removed functions gtk_object_set_data_destroy and
+       gtk_object_set_data_destroy_by_id.
+       added functions gtk_object_remove_no_notify and
+       gtk_object_remove_no_notify_by_id which will remove a certain data
+       portion without invokation of its destroy notifier, this should only
+       be used in very controled circumstances.
+
 Wed Oct  7 23:59:37 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_set_column_resizeable): added

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index af56761724e2c8362fa3b16248a29e7572da8e65..de51dbcc42b85c4491bd777278819f659d950e16 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -976,26 +976,24 @@ gtk_object_remove_data (GtkObject   *object,
 }
 
 void
-gtk_object_set_data_destroy_by_id (GtkObject      *object,
-                                  GQuark          key_id,
-                                  GDestroyNotify  destroy_func)
+gtk_object_remove_no_notify_by_id (GtkObject      *object,
+                                  GQuark          key_id)
 {
   g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (object));
 
-  g_datalist_id_set_destroy (&object->object_data, key_id, destroy_func);
+  g_datalist_id_remove_no_notify (&object->object_data, key_id);
 }
 
 void
 gtk_object_set_data_destroy (GtkObject       *object,
-                            const gchar     *key,
-                            GDestroyNotify   destroy_func)
+                            const gchar     *key)
 {
   g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (object));
   g_return_if_fail (key != NULL);
 
-  g_datalist_set_destroy (&object->object_data, key, destroy_func);
+  g_datalist_remove_no_notify (&object->object_data, key);
 }
 
 void

diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index 8360e06d8a388453dac8e02dfc18588810ae56ab..bc8ee893d6094cd545453fde585cf4f8af1508b5 100644 (file)
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -279,9 +279,8 @@ void         gtk_object_remove_data     (GtkObject       *object,
                                     const gchar     *key);
 gpointer gtk_object_get_data       (GtkObject       *object,
                                     const gchar     *key);
-void    gtk_object_set_data_destroy(GtkObject       *object,
-                                    const gchar     *key,
-                                    GDestroyNotify   destroy_func);
+void    gtk_object_remove_no_notify(GtkObject       *object,
+                                    const gchar     *key);
 
 /* Set/get the "user_data" object data field of "object". It should
  *  be noted that these functions are no different than calling
@@ -317,9 +316,8 @@ gpointer gtk_object_get_data_by_id  (GtkObject      *object,
                                         GQuark          data_id);
 void  gtk_object_remove_data_by_id     (GtkObject      *object,
                                         GQuark          data_id);
-void  gtk_object_set_data_destroy_by_id        (GtkObject      *object,
-                                        GQuark          key_id,
-                                        GDestroyNotify  destroy_func);
+void  gtk_object_remove_no_notify_by_id        (GtkObject      *object,
+                                        GQuark          key_id);
 #define        gtk_object_data_try_key     g_quark_try_string
 #define        gtk_object_data_force_id    g_quark_from_string